From: Jan Djärv <jan.h.d@swipnet.se>
Date: Mon, 23 Mar 2009 17:09:07 +0000 (+0000)
Subject: gtkutil.c (xg_display_open): Assign a value to gdpy_def, check
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~1109
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d7b1b3b538f20472b8143d219eaff262acb9c960;p=emacs.git

gtkutil.c (xg_display_open): Assign a value to gdpy_def, check
that gdpy is set.
---

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 8e3e24b6225..6d73c0358f0 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -119,9 +119,12 @@ xg_display_open (display_name, dpy)
   GdkDisplay *gdpy;
 
   gdpy = gdk_display_open (display_name);
-  if (!gdpy_def)
-    gdk_display_manager_set_default_display (gdk_display_manager_get (),
-					     gdpy);
+  if (!gdpy_def && gdpy)
+    {
+      gdpy_def = gdpy;
+      gdk_display_manager_set_default_display (gdk_display_manager_get (),
+					       gdpy);
+    }
 
   *dpy = gdpy ? GDK_DISPLAY_XDISPLAY (gdpy) : NULL;
   return gdpy != NULL;